Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Feb 2011 00:15:26 +0000 (16:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Feb 2011 00:15:26 +0000 (16:15 -0800)

Trivial merge